From: Scott Bradford Date: Sun, 10 Apr 2016 01:07:10 +0000 (-0400) Subject: update to use UTF-16LE encoding; remove now-unnecessary encoding note from xmldoc... X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~9^2~24^2~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=47d69aae461002d2e8d89ab2878c7e7e225b78ff;p=gpsbabel.git update to use UTF-16LE encoding; remove now-unnecessary encoding note from xmldoc; updated reference files --- diff --git a/internal_styles.cc b/internal_styles.cc index dfede78dc..52fc36391 100644 --- a/internal_styles.cc +++ b/internal_styles.cc @@ -750,7 +750,7 @@ static char igoprimo_poi[] = "FIELD_DELIMITER PIPE\n" "RECORD_DELIMITER CR\n" "BADCHARS \"|\n" - "ENCODING UTF-8\n" + "ENCODING UTF-16LE\n" "#\n" "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" "#\n" diff --git a/reference/igoprimo_poi.upoi b/reference/igoprimo_poi.upoi index 0297c837f..7bfa73630 100644 Binary files a/reference/igoprimo_poi.upoi and b/reference/igoprimo_poi.upoi differ diff --git a/reference/igoprimo_poi~upoi.csv b/reference/igoprimo_poi~upoi.csv index 6b665727f..3af994f90 100644 --- a/reference/igoprimo_poi~upoi.csv +++ b/reference/igoprimo_poi~upoi.csv @@ -1,10 +1,7 @@ No,Latitude,Longitude,Name,Address,City,PostalCode,Phone -1,50.877341,12.433889,"3","Hauptstrasse -1",,,"03741-999999" -2,50.964955,12.435919,"Altenburg-Umgehung",,"Plauen",,"03741-999999" -3,50.610795,12.173802,"Elsterberg",,,,"03741-999999" -4,50.844126,12.408757,"Gosel",,,,"03741-999999" -5,50.654763,12.204957,"Greiz",,,"8523","03741-999999" -6,51.314521,12.409143,"HMMMM","Hauptstrasse -2","Plauen","8523","03741-999999" -7,50.493663,12.107153,"Jahnstrasse",,,"8523","03741-999999" -8,50.493837,12.106101,"Liebknechtstrasse",,,"8523","03741-999999" -9,50.492619,12.105449,"NARVA",,,"8523","03741-999999" +1,38.870741,-77.103000,"Cathedral of St Thomas More","Cathedral Ln","Arlington","22203","+(1)-(703)-5251300" +2,38.889742,-77.013587,"Capitol Reflecting Pool",,"District of Columbia",, +3,38.884787,-77.439315,"McDonald's","Brookfield Corporate Dr","Chantilly","20151", +4,38.952749,-77.447755,"Washington Dulles International Airport","Saarinen Cir","Sterling","20166","+(1)-(703)-5722700" +5,38.857596,-77.226819,"Inova Fairfax Medical Campus","Gallows Rd","Fairfax","22031","+(1)-(703)-7764001" +6,38.871771,-77.008025,"Nationals Park","S Capitol St SE","Washington","20003","+(1)-(888)-6326287" diff --git a/reference/igoprimo_poi~upoi.gpx b/reference/igoprimo_poi~upoi.gpx index 0113994e9..1586ef676 100644 --- a/reference/igoprimo_poi~upoi.gpx +++ b/reference/igoprimo_poi~upoi.gpx @@ -1,50 +1,35 @@ - - - 3 - 3 - 3 - - - Altenburg-Umgehung - Altenburg-Umgehung - Altenburg-Umgehung - - - Elsterberg - Elsterberg - Elsterberg - - - Gosel - Gosel - Gosel - - - Greiz - Greiz - Greiz - - - HMMMM - HMMMM - HMMMM - - - Jahnstrasse - Jahnstrasse - Jahnstrasse - - - Liebknechtstrasse - Liebknechtstrasse - Liebknechtstrasse - - - NARVA - NARVA - NARVA + + + Cathedral of St Thomas More + Cathedral of St Thomas More + Cathedral of St Thomas More + + + Capitol Reflecting Pool + Capitol Reflecting Pool + Capitol Reflecting Pool + + + McDonald's + McDonald's + McDonald's + + + Washington Dulles International Airport + Washington Dulles International Airport + Washington Dulles International Airport + + + Inova Fairfax Medical Campus + Inova Fairfax Medical Campus + Inova Fairfax Medical Campus + + + Nationals Park + Nationals Park + Nationals Park diff --git a/style/igoprimo_poi.style b/style/igoprimo_poi.style index abfb9617d..36df8afa8 100644 --- a/style/igoprimo_poi.style +++ b/style/igoprimo_poi.style @@ -13,7 +13,7 @@ DATATYPE WAYPOINT FIELD_DELIMITER PIPE RECORD_DELIMITER CR BADCHARS "| -ENCODING UTF-8 +ENCODING UTF-16LE # # INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE: # diff --git a/xmldoc/formats/igoprimo_poi.xml b/xmldoc/formats/igoprimo_poi.xml index aab18b03c..075721b9b 100644 --- a/xmldoc/formats/igoprimo_poi.xml +++ b/xmldoc/formats/igoprimo_poi.xml @@ -2,10 +2,4 @@ igoprimo_poi supports POI files from iGo Primo 'next generation navigation' devices. iGo Primo is GPS Navigation Software that runs on Windows embedded platforms, and is used in some OEM and aftermarket automotive head units. - - - NOTE: GPSBabel should seamlessly read and convert .upoi files from your device. However, - when converting to .upoi format, GPSBabel will encode as UTF-8, which the device won't read - correctly. You will need to manually convert the output file to UTF-16 LE (UCS-2 LE BOM) - encoding using a text editor, and then it will work as expected. - + \ No newline at end of file